Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 25 Feb 2012 19:01:02 +0000 (11:01 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 25 Feb 2012 19:01:02 +0000 (11:01 -0800)
commitcb72e2491c58029cf8757609670494eca0c94ca4
treeaa24361effbcabd206ec67cdccefadb6a89cc15c
parent22dbc826f9d5257dee94506e89d6ff995ad313ab
parent7b59b27a17fa2275d27837efac27310f99449b6d
Merge from trunk.